From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Sat, 23 Jan 2016 17:17:39 +0000 (+0100)
Subject: Add patch for gcc6
X-Git-Tag: archive/raspbian/1.14.0+dfsg-2+rpi1^2~190
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=67535f57988ad6cb18227c5bb31dfa51c9121876;p=pcl.git

Add patch for gcc6

Closes: #812015
---

diff --git a/debian/patches/0012-Fix-compilation-on-gcc6.patch b/debian/patches/0012-Fix-compilation-on-gcc6.patch
new file mode 100644
index 00000000..f9d66f4c
--- /dev/null
+++ b/debian/patches/0012-Fix-compilation-on-gcc6.patch
@@ -0,0 +1,35 @@
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Sat, 23 Jan 2016 18:16:24 +0100
+Subject: Fix compilation on gcc6
+
+---
+ .../include/pcl/registration/correspondence_estimation_backprojection.h | 2 +-
+ .../pcl/registration/correspondence_estimation_normal_shooting.h        | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/registration/include/pcl/registration/correspondence_estimation_backprojection.h b/registration/include/pcl/registration/correspondence_estimation_backprojection.h
+index 9be0043..0a96c58 100644
+--- a/registration/include/pcl/registration/correspondence_estimation_backprojection.h
++++ b/registration/include/pcl/registration/correspondence_estimation_backprojection.h
+@@ -184,7 +184,7 @@ namespace pcl
+           * cloud for computing correspondences. By default we use k = 10 nearest 
+           * neighbors.
+           */
+-        inline void
++        inline unsigned int
+         getKSearch () const { return (k_); }
+         
+         /** \brief Clone and cast to CorrespondenceEstimationBase */
+diff --git a/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h b/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h
+index 84e7b32..4c5e0ab 100644
+--- a/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h
++++ b/registration/include/pcl/registration/correspondence_estimation_normal_shooting.h
+@@ -180,7 +180,7 @@ namespace pcl
+           * cloud for computing correspondences. By default we use k = 10 nearest 
+           * neighbors.
+           */
+-        inline void
++        inline unsigned int
+         getKSearch () const { return (k_); }
+ 
+         /** \brief Clone and cast to CorrespondenceEstimationBase */
diff --git a/debian/patches/series b/debian/patches/series
index 123c5f60..cdd2e796 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
 0009-Fix-THIS_METHOD_IS_ONLY_FOR_1x1_EXPRESSIONS.patch
 0010-Fix-THIS_METHOD_IS_ONLY_FOR_INNER_OR_LAZY_PRODUCTS.patch
 0011-Only-set-QVTK_FOUND-if-it-s-actually-found.patch
+0012-Fix-compilation-on-gcc6.patch